Skip to content

Conversation

@catreedle
Copy link
Collaborator

@catreedle catreedle commented Dec 26, 2025

Contributor checklist


Description

  • Replace i18n directory with the scribe-org/Scribe-i18n Git submodule
  • Updated CONTRIBUTING.md to document cloning and working with the i18n submodule
  • Updated android_ci.yml to ensure Git submodules are checked out in CI
  • Updated update_i18n_keys.sh to pull and commit the latest changes from the i18n submodule

Related issue

@github-actions
Copy link

Thank you for the pull request! 💙

The Scribe-Android team will do our best to address your contribution as soon as we can. If you're not already a member of our public Matrix community, please consider joining! We'd suggest that you use the Element client as well as Element X for a mobile app, and definitely join the General and Android rooms once you're in. Also consider attending our bi-weekly Saturday dev syncs. It'd be great to meet you 😊

Note

Scribe uses Conventional Comments in reviews to make sure that communication is as clear as possible.

@github-actions
Copy link

github-actions bot commented Dec 26, 2025

Maintainer Checklist

The following is a checklist for maintainers to make sure this process goes as well as possible. Feel free to address the points below yourself in further commits if you realize that actions are needed :)

  • Tests for changes have been written and the unit test, linting and formatting workflows within the PR checks do not indicate new errors in the files changed

    • Tests may need to be reran as they're at times not deterministic
  • The CHANGELOG has been updated with a description of the changes for the upcoming release and the corresponding issue (if necessary)

@andrewtavis
Copy link
Member

@angrezichatterbox and @DeleMike: The commits that are in this PR now have us in a really great place as far as switching Scribe-i18n over to a submodule rather than a subtree. @catreedle will work on fixing the hard coded strings and keys that have changed since the last update of Scribe-i18n within the project, and then it'd be great if we could do a through review seeing as how this will update many of the texts across the application 😊

Great work so far, @catreedle!

@andrewtavis andrewtavis mentioned this pull request Dec 27, 2025
2 tasks
@andrewtavis
Copy link
Member

note: Updated the PR description to reflect that this PR will close #527 and #515. We need to bring in the latest version of Scribe-i18n, and then this will finalize both once we fix any keys that are now different and replace some hard coded strings with keys. Let us know if you need support here, @catreedle!

note: Closed #526 in favor of this PR :)

@DeleMike
Copy link
Collaborator

Hi @andrewtavis , I missed the session yesterday to learn how to use the scribe-org/Scribe-i18n Git submodulein the Android app. Can you point me to a resource to see how to see this new update in action in the Android app?

@andrewtavis
Copy link
Member

Hi @DeleMike 👋 You can check the docs for Scribe-i18n - the readme - that explains it all. @catreedle will load in the submodule and then we'll be able to edit and load in new versions 😊

@DeleMike
Copy link
Collaborator

Hi @DeleMike 👋 You can check the docs for Scribe-i18n - the readme - that explains it all. @catreedle will load in the submodule and then we'll be able to edit and load in new versions 😊

Thank you @andrewtavis , I will go through it. Thank you!

@andrewtavis
Copy link
Member

Let us know when this is ready, @catreedle :) And feel free to start on bringing Scribe-i18n into Scribe-iOS when you're done here :)

@catreedle
Copy link
Collaborator Author

Let us know when this is ready, @catreedle :) And feel free to start on bringing Scribe-i18n into Scribe-iOS when you're done here :)

Hi @andrewtavis

question: what to do when some strings are missing for Android but they are already available in i18n, for example "i18n._global.privacy_policy": "Privacy Policy". Because they don't start with "i18n.app" they got filtered out by the convert_jsons_to_strings script?

@andrewtavis
Copy link
Member

Great question, @catreedle :) We should update the script to also convert the i18n._global* keys as well. Do you want to do that in Scribe-i18n? And can you look into the iOS conversion to make sure that the xcstrings file is also only getting the i18n.app and i18n._global keys? Maybe it already is, but we should check :)

@andrewtavis
Copy link
Member

I'll quickly merge in the changes to Scribe-i18n and then you can bring them over to this PR :)

@catreedle
Copy link
Collaborator Author

Great question, @catreedle :) We should update the script to also convert the i18n._global* keys as well. Do you want to do that in Scribe-i18n? And can you look into the iOS conversion to make sure that the xcstrings file is also only getting the i18n.app and i18n._global keys? Maybe it already is, but we should check :)

sure!

@catreedle
Copy link
Collaborator Author

I'll quickly merge in the changes to Scribe-i18n and then you can bring them over to this PR :)

made the PR here :)
scribe-org/Scribe-i18n#101

@andrewtavis
Copy link
Member

Scribe-i18n has been updated, @catreedle :) Note that I needed to do another commit after I merged your PR as the scripts needed to factor for i18n._global, not i18n.global (we do _global so it's alphabetically before). Let us know when this is ready to be finalized!

@catreedle
Copy link
Collaborator Author

Scribe-i18n has been updated, @catreedle :) Note that I needed to do another commit after I merged your PR as the scripts needed to factor for i18n._global, not i18n.global (we do _global so it's alphabetically before). Let us know when this is ready to be finalized!

thank you! :) sorry for the oversight

@andrewtavis
Copy link
Member

No need to apologize, @catreedle! 💙🩵

@andrewtavis
Copy link
Member

Checking in, @catreedle, are we ready for a review here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Switch Scribe-i18n from git subtree to git submodule App language resets to English when Indonesian is selected

3 participants